From 1042ff5f925e25bd151b8bd1d16f16887f844799 Mon Sep 17 00:00:00 2001 From: tsteven4 Date: Sun, 8 Jul 2018 17:29:22 -0600 Subject: [PATCH] limit scope of index variables in for loops. --- alan.cc | 11 ++++------- bushnell_trl.cc | 3 +-- cet_util.cc | 3 +-- dg-100.cc | 11 +++-------- dmtlog.cc | 8 ++++---- exif.cc | 3 +-- fatal.cc | 3 +-- garmin.cc | 31 ++++++++++++------------------- garmin_fit.cc | 7 ++----- garmin_fs.cc | 3 +-- garmin_gpi.cc | 4 +--- garmin_tables.cc | 25 +++++++------------------ garmin_txt.cc | 27 ++++++++------------------- gdb.cc | 23 ++++++++++------------- ggv_ovl.cc | 6 ++---- globalsat_sport.cc | 9 +++------ gpx.cc | 15 +++++---------- holux.cc | 3 +-- humminbird.cc | 13 ++++--------- lmx.cc | 3 +-- lowranceusr.cc | 13 ++++--------- lowranceusr4.cc | 35 +++++++++++++++-------------------- magproto.cc | 6 ++---- mkshort.cc | 10 +++------- mmo.cc | 8 +++----- mtk_locus.cc | 13 ++++--------- mtk_logger.cc | 17 +++++++---------- navicache.cc | 6 ++---- navilink.cc | 36 +++++++++++------------------------- navitel.cc | 4 ++-- netstumbler.cc | 4 ++-- nmea.cc | 16 ++++++---------- osm.cc | 4 +--- pocketfms_wp.cc | 4 ++-- position.cc | 4 ++-- psitrex.cc | 7 ++----- random.cc | 8 ++++---- raymarine.cc | 12 ++++-------- rgbcolors.cc | 3 +-- skytraq.cc | 31 ++++++++++++++----------------- teletype.cc | 3 +-- tomtom.cc | 3 +-- tpo.cc | 31 ++++++++++--------------------- trackfilter.cc | 22 ++++++++-------------- util.cc | 11 +++-------- vecs.cc | 33 ++++++++++++--------------------- wbt-200.cc | 17 ++++++----------- 47 files changed, 204 insertions(+), 368 deletions(-) diff --git a/alan.cc b/alan.cc index 5ad256fa2..4f5fdc92c 100644 --- a/alan.cc +++ b/alan.cc @@ -343,8 +343,6 @@ static void swap_trkhdr(struct trkhdr* trkhdr, static void swap_loghdr(struct loghdr* loghdr, void (*swap16_func)(void*), void (*swap32_func)(void*)) { - int i; - if (swap16_func != nullptr) { swap16_func(&(loghdr->num)); swap16_func(&(loghdr->next)); @@ -354,7 +352,7 @@ static void swap_loghdr(struct loghdr* loghdr, swap32_func(&(loghdr->date)); swap32_func(&(loghdr->time)); } - for (i=0; itrkhdr[i]), swap16_func, swap32_func); } } @@ -382,7 +380,6 @@ static void trl_swap(struct trldata* trldata) { void (*swap16_func)(void*); void (*swap32_func)(void*); - int i; switch (byte_order()) { case SWAP_NONE: /* same byte oder, LITTLE_ENDIAN */ @@ -405,7 +402,7 @@ static void trl_swap(struct trldata* trldata) } swap_loghdr(&(trldata->loghdr), swap16_func, swap32_func); - for (i=0; itrklog[i]), swap16_func, swap32_func); } } @@ -654,14 +651,14 @@ static void trl_read() static int find_wpt(struct wprdata* wprdata, const Waypoint* WP) { struct wpt pattern, *wpt; - int i, wpt_idx; + int wpt_idx; str2lab(pattern.name, WP->shortname, WPT_NAME_LEN, nullptr, 0); pattern.pt.x = deg2pt(WP->longitude); pattern.pt.y = deg2pt(-WP->latitude); wpt = wprdata->wpt; - for (i=0; iwpthdr.idx[i]; if (wpt_idx == WPT_IDX_NONE || wprdata->wpthdr.used[wpt_idx] == WPT_UNUSED) { diff --git a/bushnell_trl.cc b/bushnell_trl.cc index ec6ca14f0..db723e379 100644 --- a/bushnell_trl.cc +++ b/bushnell_trl.cc @@ -55,14 +55,13 @@ rd_deinit() static void wr_init(const QString& fname) { - int i; int l = fname.length(); char obuf[20] = { 0 } ; char* p = obuf; file_out = gbfopen_le(fname, "w", MYNAME); trkpt_count = 0; QString fnameu = fname.toUpper(); - for (i = 0; (i < l) && (i < 20); i++) { + for (int i = 0; (i < l) && (i < 20); i++) { char c = fnameu[i].toLatin1(); if (isalnum(c)) { *p++ = c; diff --git a/cet_util.cc b/cet_util.cc index d69889b68..ec00e48e3 100644 --- a/cet_util.cc +++ b/cet_util.cc @@ -245,7 +245,6 @@ cet_find_cs_by_name(const QString& name) void cet_deregister() { - int i; int j = cet_cs_alias_ct; cet_cs_alias_t* p = cet_cs_alias; @@ -256,7 +255,7 @@ cet_deregister() cet_cs_alias_ct = 0; cet_cs_alias = nullptr; - for (i = 0; i < j; i++) { + for (int i = 0; i < j; i++) { xfree(p[i].name); } xfree(p); diff --git a/dg-100.cc b/dg-100.cc index 676df6654..1ae6f4d36 100644 --- a/dg-100.cc +++ b/dg-100.cc @@ -111,10 +111,8 @@ struct dynarray16 { /* helper functions */ static struct dg100_command* dg100_findcmd(int id) { - unsigned int i; - /* linear search should be OK as long as dg100_numcommands is small */ - for (i = 0; i < model->numcommands; i++) { + for (unsigned int i = 0; i < model->numcommands; i++) { if (model->commands[i].id == id) { return(&model->commands[i]); } @@ -175,8 +173,6 @@ bintime2utc(int date, int time) static void dg100_debug(const char* hdr, int include_nl, size_t sz, unsigned char* buf) { - unsigned int i; - /* Only give byte dumps for higher debug levels */ if (global_opts.debug_level < 5) { return; @@ -184,7 +180,7 @@ dg100_debug(const char* hdr, int include_nl, size_t sz, unsigned char* buf) fprintf(stderr, "%s", hdr); - for (i = 0; i < sz; i++) { + for (unsigned int i = 0; i < sz; i++) { fprintf(stderr, "%02x ", buf[i]); } @@ -314,9 +310,8 @@ static uint16_t dg100_checksum(uint8_t buf[], int count) { uint16_t sum = 0; - int i; - for (i = 0; i < count; i++) { + for (int i = 0; i < count; i++) { sum += buf[i]; } sum &= (1<<15) - 1; diff --git a/dmtlog.cc b/dmtlog.cc index 7f034015a..e68535074 100644 --- a/dmtlog.cc +++ b/dmtlog.cc @@ -541,7 +541,7 @@ read_CTrackFile(const int version) while (wcount > 0) { Waypoint* wpt; - int32_t namect, i; + int32_t namect; wcount--; @@ -557,7 +557,7 @@ read_CTrackFile(const int version) // variants of shortname - for (i = 0; i < namect; i++) { + for (int32_t i = 0; i < namect; i++) { char* name; name = read_str(fin); @@ -732,7 +732,7 @@ dmtlog_wr_deinit() static void write_header(const route_head* trk) { - int count, i; + int count; const char ZERO = '\0'; header_written = 1; @@ -754,7 +754,7 @@ write_header(const route_head* trk) QString::number(waypt_count()) + " waypoints"; write_str(cout, fout); - for (i = 3; i <= 8; i++) { + for (int i = 3; i <= 8; i++) { gbfputc(ZERO, fout); } write_str("GPSBabel", fout); diff --git a/exif.cc b/exif.cc index fcb5349b1..5081b0b79 100644 --- a/exif.cc +++ b/exif.cc @@ -406,7 +406,6 @@ exif_read_ifd(exif_app_t* app, const uint16_t ifd_nr, gbsize_t offs, uint32_t* exif_ifd_ofs, uint32_t* gps_ifd_ofs, uint32_t* inter_ifd_ofs) { queue* elem, *tmp; - uint16_t i; exif_ifd_t* ifd; gbfile* fin = app->fexif; @@ -449,7 +448,7 @@ exif_read_ifd(exif_app_t* app, const uint16_t ifd_nr, gbsize_t offs, return ifd; } - for (i = 0; i < ifd->count; i++) { + for (uint16_t i = 0; i < ifd->count; i++) { exif_tag_t* tag; tag = (exif_tag_t*) xcalloc(sizeof(*tag), 1); diff --git a/fatal.cc b/fatal.cc index 11d5ae3b6..28edc9e14 100644 --- a/fatal.cc +++ b/fatal.cc @@ -45,8 +45,7 @@ void debug_print(int level, const char* fmt, ...) { va_list ap; - int i; - for (i=1; ishortname = QString::fromLatin1(way[i]->ident); @@ -448,8 +448,7 @@ static unsigned int checkWayPointIsAtSplit(Waypoint* wpt, GPS_PLap* laps, int nl int result = 0; if ((laps != nullptr) && (nlaps > 0)) { - int i; - for (i=(nlaps-1); i >= 0; i--) { + for (int i = (nlaps-1); i >= 0; i--) { GPS_PLap lap = laps[i]; time_t delta = lap->start_time - wpt->GetCreationTime().toTime_t(); if ((delta >= -1) && (delta <= 1)) { @@ -478,7 +477,6 @@ track_read() GPS_PTrack* array; route_head* trk_head = nullptr; int trk_num = 0; - int i; const char* trk_name = ""; GPS_PLap* laps = nullptr; int nlaps = 0; @@ -495,7 +493,7 @@ track_read() return; } - for (i = 0; i < ntracks; i++) { + for (int i = 0; i < ntracks; i++) { Waypoint* wpt; /* @@ -563,7 +561,6 @@ void route_read() { int32 nroutepts; - int i; GPS_PWay* array; /* TODO: Fixes warning but is it right? * RJL: No, the warning isn't right; GCC's flow analysis is broken. @@ -575,7 +572,7 @@ route_read() // fprintf(stderr, "Routes %d\n", (int) nroutepts); #if 1 - for (i = 0; i < nroutepts; i++) { + for (int i = 0; i < nroutepts; i++) { if (array[i]->isrte) { char* csrc = nullptr; /* What a horrible API has libjeeps for making this @@ -1041,7 +1038,7 @@ waypoint_prepare() static void waypoint_write() { - int i, n; + int n; int32 ret; n = waypoint_prepare(); @@ -1050,7 +1047,7 @@ waypoint_write() fatal(MYNAME ":communication error sending wayoints..\n"); } - for (i = 0; i < n; ++i) { + for (int i = 0; i < n; ++i) { GPS_Way_Del(&tx_waylist[i]); } if (global_opts.verbose_status) { @@ -1136,13 +1133,12 @@ route_noop(const route_head* ) static void route_write() { - int i; int n = 2 * route_waypt_count(); /* Doubled for the islink crap. */ tx_routelist = (struct GPS_SWay**) xcalloc(n,sizeof(GPS_PWay)); cur_tx_routelist_entry = tx_routelist; - for (i = 0; i < n; i++) { + for (int i = 0; i < n; i++) { tx_routelist[i] = sane_GPS_Way_New(); } @@ -1182,12 +1178,11 @@ track_waypt_pr(const Waypoint* wpt) static int track_prepare() { - int i; int32 n = track_waypt_count() + track_count(); tx_tracklist = (struct GPS_STrack**) xcalloc(n, sizeof(GPS_PTrack)); cur_tx_tracklist_entry = tx_tracklist; - for (i = 0; i < n; i++) { + for (int i = 0; i < n; i++) { tx_tracklist[i] = GPS_Track_New(); } my_track_count = 0; @@ -1201,12 +1196,12 @@ track_prepare() static void track_write() { - int i, n; + int n; n = track_prepare(); GPS_Command_Send_Track(portname, tx_tracklist, n, (eraset)? 1 : 0); - for (i = 0; i < n; i++) { + for (int i = 0; i < n; i++) { GPS_Track_Del(&tx_tracklist[i]); } xfree(tx_tracklist); @@ -1311,13 +1306,11 @@ d103_symbol_from_icon_number(unsigned int n) static int d103_icon_number_from_symbol(const QString& s) { - unsigned int i; - if (s.isNull()) { return 0; } - for (i = 0; i < sizeof(d103_icons) / sizeof(d103_icons[0]); i++) { + for (unsigned int i = 0; i < sizeof(d103_icons) / sizeof(d103_icons[0]); i++) { if (0 == (s.compare(d103_icons[i], Qt::CaseInsensitive))) { return i; } diff --git a/garmin_fit.cc b/garmin_fit.cc index b8d7b3810..3e57e3d37 100644 --- a/garmin_fit.cc +++ b/garmin_fit.cc @@ -110,9 +110,7 @@ fit_rd_init(const QString& fname) static void fit_rd_deinit() { - int local_id; - - for (local_id=0; local_id<16; local_id++) { + for (int local_id = 0; local_id<16; local_id++) { fit_message_def* def = &fit_data.message_def[local_id]; if (def->fields) { xfree(def->fields); @@ -418,7 +416,6 @@ fit_parse_data(fit_message_def* def, int time_offset) uint8_t cadence = 0xff; uint16_t power = 0xffff; int8_t temperature = 0x7f; - int i; Waypoint* waypt; int32_t startlat = 0x7fffffff; int32_t startlon = 0x7fffffff; @@ -431,7 +428,7 @@ fit_parse_data(fit_message_def* def, int time_offset) if (global_opts.debug_level >= 7) { debug_print(7,"%s: parsing fit data ID %d with num_fields=%d\n", MYNAME, def->global_id, def->num_fields); } - for (i = 0; i < def->num_fields; i++) { + for (int i = 0; i < def->num_fields; i++) { if (global_opts.debug_level >= 7) { debug_print(7,"%s: parsing field %d\n", MYNAME, i); } diff --git a/garmin_fs.cc b/garmin_fs.cc index bdef0361e..18443b5e9 100644 --- a/garmin_fs.cc +++ b/garmin_fs.cc @@ -244,10 +244,9 @@ garmin_fs_xml_fprint(const Waypoint* waypt, writer->writeTextElement(QStringLiteral("gpxx:DisplayMode"), cx); } if (gmsd->flags.category && gmsd->category) { - int i; uint16_t cx = gmsd->category; writer->writeStartElement(QStringLiteral("gpxx:Categories")); - for (i = 0; i < 16; i++) { + for (int i = 0; i < 16; i++) { if (cx & 1) { writer->writeTextElement(QStringLiteral("gpxx:Category"), QStringLiteral("Category %1").arg(i+1)); } diff --git a/garmin_gpi.cc b/garmin_gpi.cc index b1db7e743..5f0612168 100644 --- a/garmin_gpi.cc +++ b/garmin_gpi.cc @@ -1498,8 +1498,6 @@ garmin_gpi_rd_init(const QString& fname) static void garmin_gpi_wr_init(const QString& fname) { - int i; - if (gpi_timestamp != 0) { /* not the first gpi output session */ time_t t = time(nullptr); if (t <= gpi_timestamp) { @@ -1525,7 +1523,7 @@ garmin_gpi_wr_init(const QString& fname) codepage = 0; - for (i = 1250; i <= 1257; i++) { + for (int i = 1250; i <= 1257; i++) { if (QString("windows-%1").arg(i).compare(QString(opt_writecodec), Qt::CaseInsensitive) == 0) { codepage = i; break; diff --git a/garmin_tables.cc b/garmin_tables.cc index f6f324dd9..cea24539e 100644 --- a/garmin_tables.cc +++ b/garmin_tables.cc @@ -839,12 +839,11 @@ int gt_find_icon_number_from_desc(const QString& desc, garmin_formats_e garmin_f */ if (find_flag == 0) { - const char** prefix; const char* prefixes[] = { "White ", "Red ", "Green ", "Blue ", "Black ", nullptr }; // Rewrite "Green Square" to "Square, Green". - for (prefix = prefixes; *prefix != nullptr; prefix++) { + for (const char** prefix = prefixes; *prefix != nullptr; prefix++) { if (desc.startsWith(*prefix, Qt::CaseInsensitive)) { QString buff = desc; buff.replace(*prefix, ""); @@ -964,9 +963,7 @@ gt_get_icao_cc(const QString& country, const QString& shortname) grid_type gt_lookup_grid_type(const char* grid_name, const QString& module) { - grid_mapping_t* g; - - for (g = gt_mps_grid_names; (g->shortname); g++) { + for (grid_mapping_t* g = gt_mps_grid_names; (g->shortname); g++) { if (QString::compare(grid_name, g->shortname, Qt::CaseInsensitive) == 0 || QString::compare(grid_name, g->longname,Qt::CaseInsensitive) == 0) { return g->grid; @@ -993,11 +990,10 @@ const char* gt_get_mps_datum_name(const int datum_index) { const char* result; - datum_mapping_t* d; result = GPS_Math_Get_Datum_Name(datum_index); - for (d = gt_mps_datum_names; (d->jeeps_name); d++) + for (datum_mapping_t* d = gt_mps_datum_names; (d->jeeps_name); d++) if (QString::compare(result, d->jeeps_name, Qt::CaseInsensitive) == 0) { return d->mps_name; } @@ -1008,11 +1004,10 @@ gt_get_mps_datum_name(const int datum_index) int gt_lookup_datum_index(const char* datum_str, const QString& module) { - datum_mapping_t* d; int result; const char* name = datum_str; - for (d = gt_mps_datum_names; (d->jeeps_name); d++) { + for (datum_mapping_t* d = gt_mps_datum_names; (d->jeeps_name); d++) { if (QString::compare(name, d->mps_name, Qt::CaseInsensitive) == 0) { name = d->jeeps_name; break; @@ -1047,9 +1042,7 @@ gt_color_value(const unsigned int garmin_index) uint32_t gt_color_value_by_name(const QString& name) { - unsigned int i; - - for (i = 0; i < GT_COLORS_CT; i++) + for (unsigned int i = 0; i < GT_COLORS_CT; i++) if (QString::compare(gt_colors[i].name, name, Qt::CaseInsensitive) == 0) { return gt_colors[i].rgb; } @@ -1060,9 +1053,7 @@ gt_color_value_by_name(const QString& name) int gt_color_index_by_name(const QString& name) { - unsigned int i; - - for (i = 0; i < GT_COLORS_CT; i++) + for (unsigned int i = 0; i < GT_COLORS_CT; i++) if (QString::compare(gt_colors[i].name, name, Qt::CaseInsensitive) == 0) { return i; } @@ -1073,9 +1064,7 @@ gt_color_index_by_name(const QString& name) int gt_color_index_by_rgb(const int rgb) { - unsigned int i; - - for (i = 0; i < GT_COLORS_CT; i++) + for (unsigned int i = 0; i < GT_COLORS_CT; i++) if (rgb == gt_colors[i].rgb) { return i; } diff --git a/garmin_txt.cc b/garmin_txt.cc index be314a1d9..7b032e629 100644 --- a/garmin_txt.cc +++ b/garmin_txt.cc @@ -203,13 +203,11 @@ enum_waypt_cb(const Waypoint* wpt) gmsd = GMSD_FIND(wpt); wpt_class = GMSD_GET(wpt_class, 0); if (wpt_class < 0x80) { - int i; - if (gtxt_flags.enum_waypoints) { /* enumerate only */ waypoints++; return; } - for (i = 0; i < wpt_a_ct; i++) { /* check for duplicates */ + for (int i = 0; i < wpt_a_ct; i++) { /* check for duplicates */ const Waypoint* tmp = wpt_a[i]; if (case_ignore_strcmp(tmp->shortname, wpt->shortname) == 0) { wpt_a[i] = wpt; @@ -388,7 +386,7 @@ print_date_and_time(const time_t time, const int time_only) static void print_categories(uint16_t categories) { - int i, count; + int count; char* c; if (categories == 0) { @@ -396,7 +394,7 @@ print_categories(uint16_t categories) } count = 0; - for (i = 0; i < 16; i++) { + for (int i = 0; i < 16; i++) { if ((categories & 1) != 0) { if (global_opts.inifile != nullptr) { char key[3]; @@ -510,12 +508,11 @@ print_temperature(const float temperature) static void print_string(const char* fmt, const char* string) { - char* c; char* buff; buff = xstrdup(string); /* remove unwanted characters from source string */ - for (c = buff; *c; c++) { + for (char* c = buff; *c; c++) { if (iscntrl(*c)) { *c = ' '; } @@ -836,8 +833,6 @@ garmin_txt_write() gtxt_flags.enum_waypoints = 0; if (waypoints > 0) { - int i; - wpt_a_ct = 0; wpt_a = (const Waypoint**)xcalloc(waypoints, sizeof(*wpt_a)); waypt_disp_all(enum_waypt_cb); @@ -845,7 +840,7 @@ garmin_txt_write() qsort(wpt_a, waypoints, sizeof(*wpt_a), sort_waypt_cb); gbfprintf(fout, "Header\t%s\r\n\r\n", headers[waypt_header]); - for (i = 0; i < waypoints; i++) { + for (int i = 0; i < waypoints; i++) { const Waypoint* wpt = wpt_a[i]; write_waypt(wpt); } @@ -881,9 +876,7 @@ garmin_txt_write() static void free_header(const header_type ht) { - int i; - - for (i = 0; i < MAX_HEADER_FIELDS; i++) { + for (int i = 0; i < MAX_HEADER_FIELDS; i++) { char* c = header_lines[ht][i]; if (c != nullptr) { xfree(c); @@ -1005,13 +998,11 @@ parse_header() static int parse_display(const char* str, int* val) { - gt_display_modes_e i; - if ((str == nullptr) || (*str == '\0')) { return 0; } - for (i = GT_DISPLAY_MODE_MIN; i <= GT_DISPLAY_MODE_MAX; i++) { + for (gt_display_modes_e i = GT_DISPLAY_MODE_MIN; i <= GT_DISPLAY_MODE_MAX; i++) { if (case_ignore_strcmp(str, gt_display_mode_names[i]) == 0) { *val = i; return 1; @@ -1357,9 +1348,7 @@ garmin_txt_rd_init(const QString& fname) static void garmin_txt_rd_deinit() { - header_type h; - - for (h = waypt_header; h <= unknown_header; h++) { + for (header_type h = waypt_header; h <= unknown_header; h++) { free_header(h); } gbfclose(fin); diff --git a/gdb.cc b/gdb.cc index 4c067edfa..e8c06eb64 100644 --- a/gdb.cc +++ b/gdb.cc @@ -627,7 +627,7 @@ read_waypoint(gt_waypt_classes_e* waypt_class_out) res->description = l.url_; } } else { // if (gdb_ver >= GDB_VER_3) - int i, url_ct; + int url_ct; waypt_flag = 0; @@ -637,7 +637,7 @@ read_waypoint(gt_waypt_classes_e* waypt_class_out) FREAD(buf, 5); /* instruction depended */ res->description = FREAD_CSTR_AS_QSTR; /* instruction */ url_ct = FREAD_i32; - for (i = url_ct; (i); i--) { + for (int i = url_ct; (i); i--) { QString str = FREAD_CSTR_AS_QSTR; if (!str.isEmpty()) { waypt_add_url(res, str, nullptr); @@ -732,7 +732,7 @@ static route_head* read_route() { route_head* rte; - int points, warnings, links, i; + int points, warnings, links; char buf[128]; bounds bounds; @@ -767,8 +767,8 @@ read_route() nice(rte->rte_name), points); #endif - for (i = 0; i < points; i++) { - int wpt_class, j; + for (int i = 0; i < points; i++) { + int wpt_class; char buf[128]; garmin_ilink_t* il_root, *il_anchor; @@ -793,15 +793,13 @@ read_route() FREAD(buf, 18); /* unknown 18 bytes; but first should be 0x01 or 0x03 */ /* seen also 0 with VER3 */ if ((buf[0] != 0x00) && (buf[0] != 0x01) && (buf[0] != 0x03)) { - int i; - warnings++; if (warnings > 3) { fatal(MYNAME "-rte_pt \"%s\": too many warnings!\n", qPrintable(wpt->shortname)); } warning(MYNAME "-rte_pt \"%s\" (class %d): possible error in route.\n", qPrintable(wpt->shortname), wpt_class); warning(MYNAME "-rte_pt (dump):"); - for (i = 0; i < 18; i++) { + for (int i = 0; i < 18; i++) { warning(" %02x", (unsigned char)buf[i]); } warning("\n"); @@ -815,7 +813,7 @@ read_route() printf(MYNAME "-rte_pt \"%s\" (%d): %d interlink step(s)\n", nice(wpt->shortname), wpt_class, links); #endif - for (j = 0; j < links; j++) { + for (int j = 0; j < links; j++) { garmin_ilink_t* il_step = (garmin_ilink_t*) xmalloc(sizeof(*il_step)); il_step->ref_count = 1; @@ -947,7 +945,7 @@ static route_head* read_track() { route_head* res; - int points, index; + int points; char dummy; int color_idx; @@ -963,7 +961,7 @@ read_track() points = FREAD_i32; - for (index = 0; index < points; index++) { + for (int index = 0; index < points; index++) { Waypoint* wpt = new Waypoint; trkpt_ct++; @@ -1124,12 +1122,11 @@ read_data() warning(MYNAME ":(%d%c): delta = %d -", gdb_ver, typ, delta); } if (delta > 0) { - int i; char* buf = (char*) xmalloc(delta); if (FREAD(buf, delta) < 1) { fatal(MYNAME ": Attempt to read past EOF.\n"); } - for (i = 0; i < delta; i++) { + for (int i = 0; i < delta; i++) { warning(" %02x", (unsigned char)buf[i]); } xfree(buf); diff --git a/ggv_ovl.cc b/ggv_ovl.cc index f6a546bf2..c4fe706b0 100644 --- a/ggv_ovl.cc +++ b/ggv_ovl.cc @@ -101,11 +101,10 @@ static void ggv_ovl_read() { int symbols; - int i; symbols = inifile_readint_def(inifile, "Overlay", "Symbols", -1); - for (i = 1; i <= symbols; i++) { + for (int i = 1; i <= symbols; i++) { int points; OVL_SYMBOL_TYP type; char symbol[32]; @@ -130,7 +129,6 @@ ggv_ovl_read() } if (points > 0) { - int j; route_head* rte, *trk; rte = trk = route_head_alloc(); @@ -144,7 +142,7 @@ ggv_ovl_read() trk->rte_name = QString("Track %1").arg(track_ct); } - for (j = 0; j < points; j++) { + for (int j = 0; j < points; j++) { wpt = new Waypoint; diff --git a/globalsat_sport.cc b/globalsat_sport.cc index 9080dd513..269fcbfbb 100644 --- a/globalsat_sport.cc +++ b/globalsat_sport.cc @@ -325,7 +325,6 @@ globalsat_read_package(int* out_length, uint8_t* out_DeviceCommand) uint8_t DeviceCommand, len_h, len_l, crc; uint8_t* payload; int length; - int i; uint8_t calc_crc = 0; DeviceCommand = recv_byte(); @@ -347,7 +346,7 @@ globalsat_read_package(int* out_length, uint8_t* out_DeviceCommand) goto error_out; } - for (i = 0; i < length; i++) { + for (int i = 0; i < length; i++) { payload[i] = recv_byte(); calc_crc ^= payload[i]; } @@ -676,8 +675,7 @@ track_read() int laps_in_package = header.gh_laprec.LapIndex - header.gh_ptrec.Index + 1; // printf("Lap Data:\n"); uint8_t* lap_start_pos = track_payload + 29; //29=packed sizeof(gh_trainheader) - int lap; - for (lap = 0; lap < laps_in_package; lap++) { + for (int lap = 0; lap < laps_in_package; lap++) { uint8_t* dblap = (lap_start_pos) + lap * 41; // packed sizeof(gh_db_lap)=41 gh_db_lap db_lap; @@ -754,8 +752,7 @@ track_read() int recpoints_in_package = header.gh_laprec.EndPt - header.gh_ptrec.StartPt + 1; // printf("Recpoints Data:\n"); uint8_t* recpoints_start_pos = track_payload + 29; //29=packed sizeof(gh_trainheader) - int recpoint; - for (recpoint = 0; recpoint < recpoints_in_package; recpoint++) { + for (int recpoint = 0; recpoint < recpoints_in_package; recpoint++) { uint8_t* ghpoint = (recpoints_start_pos + recpoint * 25); // packed sizeof(gh_recpoint)=25 gh_recpoint point; point.Latitude = be_read32(ghpoint); diff --git a/gpx.cc b/gpx.cc index b6d052002..d67f43f7c 100644 --- a/gpx.cc +++ b/gpx.cc @@ -440,8 +440,7 @@ get_tag(const QString& t, int* passthrough) static void prescan_tags() { - tag_mapping* tm; - for (tm = tag_path_map; tm->tag_type_ != 0; tm++) { + for (tag_mapping* tm = tag_path_map; tm->tag_type_ != 0; tm++) { hash[tm->tag_name] = tm; } } @@ -752,10 +751,9 @@ struct geocache_type gs_mktype(const QString& t) { - int i; int sz = sizeof(gs_type_map) / sizeof(gs_type_map[0]); - for (i = 0; i < sz; i++) { + for (int i = 0; i < sz; i++) { if (!t.compare(gs_type_map[i].name,Qt::CaseInsensitive)) { return gs_type_map[i].type; } @@ -766,10 +764,9 @@ gs_mktype(const QString& t) const char* gs_get_cachetype(geocache_type t) { - int i; int sz = sizeof(gs_type_map) / sizeof(gs_type_map[0]); - for (i = 0; i < sz; i++) { + for (int i = 0; i < sz; i++) { if (t == gs_type_map[i].type) { return gs_type_map[i].name; } @@ -780,10 +777,9 @@ gs_get_cachetype(geocache_type t) geocache_container gs_mkcont(const QString& t) { - int i; int sz = sizeof(gs_container_map) / sizeof(gs_container_map[0]); - for (i = 0; i < sz; i++) { + for (int i = 0; i < sz; i++) { if (!t.compare(gs_container_map[i].name,Qt::CaseInsensitive)) { return gs_container_map[i].type; } @@ -794,10 +790,9 @@ gs_mkcont(const QString& t) const char* gs_get_container(geocache_container t) { - int i; int sz = sizeof(gs_container_map) / sizeof(gs_container_map[0]); - for (i = 0; i < sz; i++) { + for (int i = 0; i < sz; i++) { if (t == gs_container_map[i].type) { return gs_container_map[i].name; } diff --git a/holux.cc b/holux.cc index 8b6f54db6..46017dbe9 100644 --- a/holux.cc +++ b/holux.cc @@ -79,7 +79,6 @@ static void data_read() { char name[9], desc[90]; unsigned char* HxWpt; - int iCount; int iDataRead; int iWptNum; WPT* pWptHxTmp; @@ -100,7 +99,7 @@ static void data_read() iWptNum = le_read16(&((WPTHDR*)HxWpt)->num); /* Get the waypoints */ - for (iCount = 0; iCount < iWptNum ; iCount ++) { + for (int iCount = 0; iCount < iWptNum ; iCount ++) { Waypoint* wpt_tmp = new Waypoint; int iWptIndex = le_read16(&((WPTHDR*)HxWpt)->idx[iCount]); diff --git a/humminbird.cc b/humminbird.cc index 7635e49ca..fa0d05f7c 100644 --- a/humminbird.cc +++ b/humminbird.cc @@ -345,10 +345,9 @@ humminbird_read_route(gbfile* fin) hrte.num = be_read16(&hrte.num); if (hrte.count > 0) { - int i; route_head* rte = nullptr; - for (i = 0; i < hrte.count; i++) { + for (int i = 0; i < hrte.count; i++) { char buff[10]; hrte.points[i] = be_read16(&hrte.points[i]); @@ -379,7 +378,6 @@ humminbird_read_track(gbfile* fin) humminbird_trk_point_t* points; route_head* trk; Waypoint* first_wpt; - int i; int max_points = 0; int32_t accum_east; int32_t accum_north; @@ -443,7 +441,7 @@ humminbird_read_track(gbfile* fin) /* No depth info in the header. */ track_add_wpt(trk, first_wpt); - for (i=0 ; ialtitude = 0.0; track_add_wpt(trk, first_wpt); - for (i=0 ; icount > 0) { - int i; - humrte->num = rte_num++; humrte->time = gpsbabel_time; - for (i = 0; i < humrte->count; i++) { + for (int i = 0; i < humrte->count; i++) { be_write16(&humrte->points[i], humrte->points[i]); } diff --git a/lmx.cc b/lmx.cc index 5bc2fa27e..217d68b12 100644 --- a/lmx.cc +++ b/lmx.cc @@ -148,8 +148,7 @@ lmx_stag(int tag) static void lmx_indent(int count) { - int i; - for (i=0; i maxlen) { len = maxlen; } @@ -244,7 +243,7 @@ lowranceusr_readstr(char* buf, const int maxlen, gbfile* file) } // IWay 350C puts 0x01 for the accented o in the street name // of the Montreal Holiday Inn. - for (i = 0; i < len; i++) { + for (int i = 0; i < len; i++) { if (buf[i] == 0x01) { buf[i] = '*'; } @@ -258,9 +257,7 @@ lowranceusr_readstr(char* buf, const int maxlen, gbfile* file) const QString lowranceusr_find_desc_from_icon_number(const int icon) { - const lowranceusr_icon_mapping_t* i; - - for (i = lowranceusr_icon_value_table; i->icon; i++) { + for (const lowranceusr_icon_mapping_t* i = lowranceusr_icon_value_table; i->icon; i++) { if (icon == i->value) { return i->icon; } @@ -272,7 +269,6 @@ lowranceusr_find_desc_from_icon_number(const int icon) static int lowranceusr_find_icon_number_from_desc(const QString& desc) { - const lowranceusr_icon_mapping_t* i; int n; if (desc.isNull()) { @@ -289,7 +285,7 @@ lowranceusr_find_icon_number_from_desc(const QString& desc) } - for (i = lowranceusr_icon_value_table; i->icon; i++) { + for (const lowranceusr_icon_mapping_t* i = lowranceusr_icon_value_table; i->icon; i++) { if (desc.compare(i->icon,Qt::CaseInsensitive) == 0) { return i->value; } @@ -494,7 +490,6 @@ lowranceusr_parse_icons() { char buff[MAXUSRSTRINGSIZE + 1]; short int num_icons; - int i; num_icons = gbfgetint16(file_in); @@ -502,7 +497,7 @@ lowranceusr_parse_icons() printf(MYNAME " parse_icons: num Icons = %d\n", num_icons); } - for (i=0; i < num_icons && !gbfeof(file_in); i++) { + for (int i = 0; i < num_icons && !gbfeof(file_in); i++) { if (ignoreicons) { /* position coord lat & long */ (void) gbfread(&buff[0], 4, 2, file_in); diff --git a/lowranceusr4.cc b/lowranceusr4.cc index 7670042b9..88b6657e9 100644 --- a/lowranceusr4.cc +++ b/lowranceusr4.cc @@ -95,11 +95,10 @@ lowranceusr4_readstr(char* buf, const int maxlen, gbfile* file, int bytes_per_ch bits (or more). for now let's just project the characters down onto utf-8 space by ignoring all but the most significant byte. */ - int i, j; char discard; - for (i = 0; i < len/bytes_per_char; ++i) { + for (int i = 0; i < len/bytes_per_char; ++i) { bytesread += gbfread(&buf[i], 1, 1, file); - for (j = 1; j < bytes_per_char; ++j) { + for (int j = 1; j < bytes_per_char; ++j) { bytesread +=gbfread(&discard, 1, 1, file); } } @@ -299,10 +298,9 @@ same_points(const Waypoint* A, const Waypoint* B) static void register_waypt(const Waypoint* ref) { - int i; Waypoint* wpt = const_cast(ref); - for (i = 0; i < waypt_table_ct; i++) { + for (int i = 0; i < waypt_table_ct; i++) { Waypoint* cmp = waypt_table[i]; if (same_points(wpt, cmp)) { @@ -333,8 +331,7 @@ register_waypt(const Waypoint* ref) static int lowranceusr4_find_waypt_index(const Waypoint* wpt) { - int i; - for (i = 0; i < waypt_table_ct; ++i) { + for (int i = 0; i < waypt_table_ct; ++i) { if (same_points(wpt, (const Waypoint*)waypt_table[i])) { return i; } @@ -348,7 +345,7 @@ static void lowranceusr4_parse_waypoints() { short int icon_num; - unsigned int i, num_waypts, create_date, create_time; + unsigned int num_waypts, create_date, create_time; char buff[MAXUSRSTRINGSIZE + 1]; num_waypts = gbfgetint32(file_in); @@ -357,7 +354,7 @@ lowranceusr4_parse_waypoints() printf(MYNAME " parse_waypoints: Num waypoints %d\n", num_waypts); } - for (i = 0; i < num_waypts; ++i) { + for (unsigned int i = 0; i < num_waypts; ++i) { Waypoint* wpt_tmp; wpt_tmp = new Waypoint; @@ -506,7 +503,7 @@ lowranceusr4_find_waypt(int uid_unit, int uid_seq_low, int uid_seq_high) static void lowranceusr4_parse_routes() { - unsigned int num_routes, i, j, text_len; + unsigned int num_routes, text_len; unsigned int num_legs; char buff[MAXUSRSTRINGSIZE + 1]; Waypoint* wpt_tmp; @@ -518,7 +515,7 @@ lowranceusr4_parse_routes() printf(MYNAME " parse_routes: Num routes = %d\n", num_routes); } - for (i = 0; i < num_routes; ++i) { + for (unsigned int i = 0; i < num_routes; ++i) { rte_head = route_head_alloc(); route_add_head(rte_head); rte_head->rte_num = i+1; @@ -562,7 +559,7 @@ lowranceusr4_parse_routes() qPrintable(rte_head->rte_name), num_legs); } - for (j = 0; j < num_legs; ++j) { + for (unsigned int j = 0; j < num_legs; ++j) { uid_unit = gbfgetint32(file_in); uid_seq_low = gbfgetint32(file_in); uid_seq_high = gbfgetint32(file_in); @@ -584,7 +581,7 @@ lowranceusr4_parse_routes() static void lowranceusr4_parse_trails() { - int num_trails, M, i, j, k, trk_num; + int num_trails, M, trk_num; char buff[MAXUSRSTRINGSIZE + 1]; Waypoint* wpt_tmp; @@ -595,7 +592,7 @@ lowranceusr4_parse_trails() printf(MYNAME " parse_trails: num trails = %d\n", num_trails); } - for (i = trk_num = 0; i < num_trails; ++i) { + for (int i = trk_num = 0; i < num_trails; ++i) { trk_head = route_head_alloc(); trk_head->rte_num = ++trk_num; track_add_head(trk_head); @@ -690,7 +687,7 @@ lowranceusr4_parse_trails() trk_num, qPrintable(trk_head->rte_name), num_trail_pts); } - for (j = 0; j < num_trail_pts; ++j) { + for (int j = 0; j < num_trail_pts; ++j) { wpt_tmp = new Waypoint; /* Some unknown bytes */ @@ -706,7 +703,7 @@ lowranceusr4_parse_trails() /* Mysterious per-trackpoint data, toss it for now */ M = gbfgetint32(file_in); - for (k = 0; k < M; ++k) { + for (int k = 0; k < M; ++k) { gbfgetc(file_in); gbfgetflt(file_in); } @@ -840,9 +837,7 @@ lowranceusr4_waypt_disp(const Waypoint* wpt) static void lowranceusr4_write_waypoints() { - int i; - -/* enumerate all waypoints from both the plain old waypoint list and + /* enumerate all waypoints from both the plain old waypoint list and also all routes */ waypt_table_sz = 0; waypt_table_ct = 0; @@ -856,7 +851,7 @@ lowranceusr4_write_waypoints() gbfputint32(waypt_table_ct, file_out); waypt_uid = 0; - for (i = 0; i < waypt_table_ct; ++i) { + for (int i = 0; i < waypt_table_ct; ++i) { if (global_opts.debug_level >= 2) { printf(MYNAME " writing out waypt %d (%s - %s)\n", i, qPrintable(waypt_table[i]->shortname), qPrintable(waypt_table[i]->description)); diff --git a/magproto.cc b/magproto.cc index 22634b5d5..3bcae258b 100644 --- a/magproto.cc +++ b/magproto.cc @@ -279,9 +279,8 @@ unsigned int mag_checksum(const char* const buf) { int csum = 0; - const char* p; - for (p = buf; *p; p++) { + for (const char* p = buf; *p; p++) { csum ^= *p; } @@ -1222,7 +1221,6 @@ mag_wptparse(char* trkmsg) Waypoint* waypt; char* icons; char* icone; - char* blah; int i = 0; descr[0] = 0; @@ -1239,7 +1237,7 @@ mag_wptparse(char* trkmsg) mag_dequote(descr); - for (blah = icons ; blah < icone; blah++) { + for (char* blah = icons ; blah < icone; blah++) { icon_token[i++] = *blah; } icon_token[i++] = '\0'; diff --git a/mkshort.cc b/mkshort.cc index 189abc216..be4cd9f67 100644 --- a/mkshort.cc +++ b/mkshort.cc @@ -87,10 +87,9 @@ MKSHORT_NEW_HANDLE(DEBUG_PARAMS) mkshort_new_handle() #endif { - int i; mkshort_handle_imp* h = (mkshort_handle_imp*) xxcalloc(sizeof *h, 1, file, line); - for (i = 0; i < PRIME; i++) { + for (int i = 0; i < PRIME; i++) { QUEUE_INIT(&h->namelist[i]); } @@ -162,13 +161,12 @@ void mkshort_del_handle(short_handle* h) { mkshort_handle_imp* hdr = (mkshort_handle_imp*) *h; - int i; if (!h || !hdr) { return; } - for (i = 0; i < PRIME; i++) { + for (int i = 0; i < PRIME; i++) { queue* e, *t; QUEUE_FOR_EACH(&hdr->namelist[i], e, t) { uniq_shortname* s = (uniq_shortname*) e; @@ -204,13 +202,11 @@ static char* delete_last_vowel(int start, char* istring, int* replaced) { - int l; - /* * Basically impelement strrchr. */ *replaced = 0; - for (l = strlen(istring); l > start; l--) { + for (int l = strlen(istring); l > start; l--) { if (strchr(vowels, istring[l-1])) { char* ostring; /* If vowel is the first letter of a word, keep it.*/ diff --git a/mmo.cc b/mmo.cc index c8aa3a258..44008c6c2 100644 --- a/mmo.cc +++ b/mmo.cc @@ -641,7 +641,7 @@ mmo_read_CObjTrack(mmo_data_t* data) #ifdef MMO_DBG const char* sobj = "CObjTrack"; #endif - int tp, ctp; + int tp; route_head* trk; DBG((sobj, ":-----------------------------------------------------\n")); @@ -668,7 +668,7 @@ mmo_read_CObjTrack(mmo_data_t* data) tp = gbfgetint16(fin); DBG((sobj, "track has %d point(s)\n", tp)); - for (ctp = 0; ctp < tp; ctp++) { + for (int ctp = 0; ctp < tp; ctp++) { Waypoint* wpt; char unk; @@ -1480,8 +1480,6 @@ mmo_wr_deinit() static void mmo_write() { - int i; - /* find out number of objects we have to write */ waypt_disp_all(mmo_enum_waypt_cb); route_disp_all(mmo_enum_route_cb, nullptr, mmo_enum_waypt_cb); @@ -1490,7 +1488,7 @@ mmo_write() gbfputuint16(mmo_obj_ct, fout); mmo_write_obj_head("CObjIcons", "Unnamed object", gpsbabel_time, obj_type_ico); - for (i = 0; i < 5; i++) { + for (int i = 0; i < 5; i++) { gbfputuint16(0, fout); } diff --git a/mtk_locus.cc b/mtk_locus.cc index f1fe804a4..eb3b38ae5 100644 --- a/mtk_locus.cc +++ b/mtk_locus.cc @@ -159,8 +159,6 @@ mtk_locus_rd_deinit() static void mtk_locus_read() { - int i; - track = route_head_alloc(); track_add_head(track); dbg(1, "Track initialized\n"); @@ -174,7 +172,7 @@ mtk_locus_read() read_line(); // initial serial buffer may contain garbage, so read until valid packet found - for (i=0; i<10; i++) { + for (int i = 0; i<10; i++) { process_packet(); read_line(); if (valid_packet_found) { @@ -345,8 +343,6 @@ process_pmtklox() uint8_t calculated_checksum; int hexval; uint8_t fixbytes[16]; - int i; - int wordnum; int bytenum; int fixnum; static Waypoint* trkpt; @@ -400,12 +396,12 @@ process_pmtklox() fixnum++; bytenum = 0; calculated_checksum = 0; - for (wordnum=0; wordnum<4; wordnum++) { // 4 8-byte hex strings per fix + for (int wordnum = 0; wordnum<4; wordnum++) { // 4 8-byte hex strings per fix if (token == nullptr) { dbg(1, "Line %i: Fix %i incomplete data\n", packetnum, fixnum); return; } - for (i=0; i<4; i++) { + for (int i = 0; i<4; i++) { sscanf(&token[i * 2], "%2x", &hexval); fixbytes[bytenum++] = hexval; calculated_checksum ^= hexval; @@ -590,11 +586,10 @@ send_command(const char* s, const char* wait_for) int calculate_checksum(const char* s, int length) { - int i; int sum; sum = 0; - for (i=0; i 5) { - int j; fprintf(stderr,"# Data block:"); - for (j=0; j DISTANCE && global_opts.debug_level > 0) { warning(MYNAME ": Unknown size/meaning of bit %d\n", i); diff --git a/navicache.cc b/navicache.cc index a7258a806..a9d3678a2 100644 --- a/navicache.cc +++ b/navicache.cc @@ -64,10 +64,9 @@ static geocache_type nc_mktype(const QString& t) { - int i; int sz = sizeof(nc_type_map) / sizeof(nc_type_map[0]); - for (i = 0; i < sz; i++) { + for (int i = 0; i < sz; i++) { if (0 == t.compare(nc_type_map[i].name, Qt::CaseInsensitive)) { return nc_type_map[i].type; } @@ -79,10 +78,9 @@ static geocache_container nc_mkcont(const QString& t) { - int i; int sz = sizeof(nc_container_map) / sizeof(nc_container_map[0]); - for (i = 0; i < sz; i++) { + for (int i = 0; i < sz; i++) { if (0 == t.compare(nc_container_map[i].name, Qt::CaseInsensitive)) { return nc_container_map[i].type; } diff --git a/navilink.cc b/navilink.cc index 85acb169c..365cb59d9 100644 --- a/navilink.cc +++ b/navilink.cc @@ -176,9 +176,7 @@ static void (*write_route_end)(const route_head* track) = nullptr; static int find_icon_from_descr(const QString& descr) { - unsigned int i; - - for (i = 0; i < sizeof(icon_table) / sizeof(const char*); i++) { + for (unsigned int i = 0; i < sizeof(icon_table) / sizeof(const char*); i++) { if (0 == descr.compare(icon_table[i])) { return i; } @@ -190,9 +188,7 @@ find_icon_from_descr(const QString& descr) static void free_waypoints(Waypoint** waypts) { - Waypoint** wayptp; - - for (wayptp = waypts; wayptp < waypts + MAX_WAYPOINTS; wayptp++) { + for (Waypoint** wayptp = waypts; wayptp < waypts + MAX_WAYPOINTS; wayptp++) { if (*wayptp) { delete *wayptp; } @@ -473,7 +469,6 @@ serial_read_waypoints() Waypoint** waypts = nullptr; unsigned char information[32]; unsigned short total; - unsigned short start; if (global_opts.masked_objective & RTEDATAMASK) { waypts = (Waypoint**) xcalloc(MAX_WAYPOINTS, sizeof(Waypoint*)); @@ -486,11 +481,10 @@ serial_read_waypoints() total = le_read16(information + 0); - for (start = 0; start < total; start += 32) { + for (unsigned short start = 0; start < total; start += 32) { unsigned short count = total - start; unsigned char payload[7]; unsigned char* waypoints; - unsigned char* w; if (count > 32) { count = 32; @@ -506,7 +500,7 @@ serial_read_waypoints() read_packet(PID_DATA, waypoints, count * 32, count * 32, FALSE); - for (w = waypoints; w < waypoints + count * 32; w = w + 32) { + for (unsigned char* w = waypoints; w < waypoints + count * 32; w = w + 32) { if (global_opts.masked_objective & WPTDATAMASK) { waypt_add(decode_waypoint(w)); } @@ -569,7 +563,6 @@ serial_read_track() unsigned short count = total < MAX_READ_TRACKPOINTS ? total : MAX_READ_TRACKPOINTS; unsigned char payload[7]; unsigned char* trackpoints; - unsigned char* t; le_write32(payload + 0, address); le_write16(payload + 4, count * 32); @@ -582,7 +575,7 @@ serial_read_track() read_packet(PID_DATA, trackpoints, count * 32, count * 32, FALSE); write_packet(PID_ACK, nullptr, 0); - for (t = trackpoints; t < trackpoints + count * 32; t = t + 32) { + for (unsigned char* t = trackpoints; t < trackpoints + count * 32; t = t + 32) { track_add_wpt(track, decode_trackpoint(t)); } @@ -656,7 +649,6 @@ serial_read_routes(Waypoint** waypts) { unsigned char information[32]; unsigned char routec; - unsigned char r; write_packet(PID_QRY_INFORMATION, nullptr, 0); read_packet(PID_DATA, information, @@ -665,11 +657,10 @@ serial_read_routes(Waypoint** waypts) routec = information[2]; - for (r = 0; r < routec; r++) { + for (unsigned char r = 0; r < routec; r++) { unsigned char payload[7]; unsigned char routedata[320]; route_head* route; - int sr; le_write32(payload + 0, r); le_write16(payload + 2, 0); @@ -683,10 +674,8 @@ serial_read_routes(Waypoint** waypts) route->rte_name = xstrdup((char*)routedata + 4); route_add_head(route); - for (sr = 0; sr < MAX_SUBROUTES; sr++) { - int w; - - for (w = 0; w < MAX_SUBROUTE_LENGTH; w++) { + for (int sr = 0; sr < MAX_SUBROUTES; sr++) { + for (int w = 0; w < MAX_SUBROUTE_LENGTH; w++) { unsigned short id = le_read16(routedata + 34 + 32 * sr + 2 *w); if (id == 0xffffu) { @@ -735,7 +724,6 @@ serial_write_route_end(const route_head* route) { unsigned char* data; unsigned src; - unsigned sr; unsigned char id[1]; QString rte_name; @@ -763,14 +751,13 @@ serial_write_route_end(const route_head* route) data[30] = 0x7b; data[31] = 0x77; - for (sr = 0; sr < src; sr++) { + for (unsigned sr = 0; sr < src; sr++) { unsigned char* srdata = data + 32 + 32 * sr; unsigned pt_offset = MAX_SUBROUTE_LENGTH * sr; - unsigned pt; le_write16(srdata + 0, 0x2010); - for (pt = 0; pt < MAX_SUBROUTE_LENGTH; pt++) { + for (unsigned pt = 0; pt < MAX_SUBROUTE_LENGTH; pt++) { if (pt_offset + pt < route_id_ptr) { le_write16(srdata + 2 + 2 * pt, route_ids[pt_offset + pt]); } else { @@ -905,7 +892,6 @@ read_datalog_records(route_head* track, unsigned int start_addr, unsigned int len) { unsigned char payload[7]; - unsigned char* p; /* The protocol only supports reading 256 logpoints at once, so * read small chunks until none left. */ @@ -921,7 +907,7 @@ read_datalog_records(route_head* track, read_packet(PID_DATA, logpoints, logpoints_len, logpoints_len, FALSE); write_packet(PID_ACK, nullptr, 0); - for (p = logpoints; p < logpoints + logpoints_len; p += 32) { + for (unsigned char* p = logpoints; p < logpoints + logpoints_len; p += 32) { track_add_wpt(track, navilink_decode_logpoint(p)); } diff --git a/navitel.cc b/navitel.cc index 6b88c3e10..d9dc54f6f 100644 --- a/navitel.cc +++ b/navitel.cc @@ -48,13 +48,13 @@ navitel_rd_deinit() static void navitel_read_track() { - int points, i; + int points; route_head* trk = nullptr; points = gbfgetint32(fin); (void) gbfgetint32(fin); /* unknown */ - for (i = 0; i < points; i++) { + for (int i = 0; i < points; i++) { int lat, lon; Waypoint* wpt; diff --git a/netstumbler.cc b/netstumbler.cc index e6efac17c..8d1038f99 100644 --- a/netstumbler.cc +++ b/netstumbler.cc @@ -97,7 +97,7 @@ data_read() while ((ibuf = gbfgetstr(file_in))) { char* field; - int field_num, len, i, stealth = 0; + int field_num, len, stealth = 0; if ((line++ == 0) && file_in->unicode) { cet_convert_init(CET_CHARSET_UTF8, 1); @@ -160,7 +160,7 @@ data_read() if (!snmac) { int found = 0; /* check for all whitespace */ - for (i = 0; i < len && !found; i++) { + for (int i = 0; i < len && !found; i++) { if (!isspace(ssid[i])) { found = 1; } diff --git a/nmea.cc b/nmea.cc index b9ebb3a4f..38b89ba89 100644 --- a/nmea.cc +++ b/nmea.cc @@ -225,9 +225,8 @@ int nmea_cksum(const char* const buf) { int x = 0 ; - const char* p; - for (p = buf; *p; p++) { + for (const char* p = buf; *p; p++) { x ^= *p; } return x; @@ -883,7 +882,6 @@ nmea_fix_timestamps(route_head* track) } } else { time_t prev; - queue* elem; tm.tm_hour = 23; /* last date found */ tm.tm_min = 59; @@ -893,7 +891,7 @@ nmea_fix_timestamps(route_head* track) /* go backward through the track and complete timestamps */ - for (elem = QUEUE_LAST(&track->waypoint_list); elem != &track->waypoint_list; elem=elem->prev) { + for (queue* elem = QUEUE_LAST(&track->waypoint_list); elem != &track->waypoint_list; elem=elem->prev) { Waypoint* wpt = (Waypoint*)elem; if (wpt->wpt_flags.fmt_use != 0) { @@ -1119,8 +1117,7 @@ nmea_rd_posn_init(const QString& fname) static void safe_print(int cnt, const char* b) { - int i; - for (i = 0; i < cnt; i++) { + for (int i = 0; i < cnt; i++) { char c = isprint(b[i]) ? b[i] : '.'; fputc(c, stderr); } @@ -1175,7 +1172,6 @@ nmea_rd_posn(posn_status*) { char ibuf[1024]; static double lt = -1; - int i; int am_sirf = 0; /* @@ -1185,7 +1181,7 @@ nmea_rd_posn(posn_status*) * to get any better than we now have) hand that back to the caller. */ - for (i = 0; i < 10; i++) { + for (int i = 0; i < 10; i++) { int rv; ibuf[0] = 0; rv = gbser_read_line(gbser_handle, ibuf, sizeof(ibuf), 2000, 0x0a, 0x0d); @@ -1437,10 +1433,10 @@ ff_vecs_t nmea_vecs = { static void sirf_write(unsigned char* buf) { - int i, chksum = 0; + int chksum = 0; int len = buf[2] << 8 | buf[3]; - for (i = 0; i < len; i++) { + for (int i = 0; i < len; i++) { chksum += buf[4 + i]; } chksum &= 0x7fff; diff --git a/osm.cc b/osm.cc index e9fe95931..c35641bf7 100644 --- a/osm.cc +++ b/osm.cc @@ -704,13 +704,11 @@ osm_rd_deinit() static void osm_init_icons() { - int i; - if (!icons.isEmpty()) { return; } - for (i = 0; osm_icon_mappings[i].value; i++) { + for (int i = 0; osm_icon_mappings[i].value; i++) { icons.insert(QString::fromUtf8(osm_icon_mappings[i].icon), &osm_icon_mappings[i]); } diff --git a/pocketfms_wp.cc b/pocketfms_wp.cc index 5c6d1f1b8..9fae15ea5 100644 --- a/pocketfms_wp.cc +++ b/pocketfms_wp.cc @@ -106,10 +106,10 @@ enigma_waypt_disp(const Waypoint* wpt) { if (!wpt->shortname.isEmpty()) { // The output might have a space or control character. - int i, l = wpt->shortname.length(); + int l = wpt->shortname.length(); char *t = (char*) xmalloc(l + 1); char* d = t; - for (i = 0; i < l; i++) { + for (int i = 0; i < l; i++) { char s = wpt->shortname[i].cell(); if (isgraph(s)) { *d++ = s; diff --git a/position.cc b/position.cc index 5b9688253..9c10ae786 100644 --- a/position.cc +++ b/position.cc @@ -45,7 +45,7 @@ void PositionFilter::position_runqueue(queue* q, int nelems, int qtype) Waypoint** comp; int* qlist; double dist, diff_time; - int i = 0, j, anyitem; + int i = 0, anyitem; comp = (Waypoint**) xcalloc(nelems, sizeof(*comp)); qlist = (int*) xcalloc(nelems, sizeof(*qlist)); @@ -65,7 +65,7 @@ void PositionFilter::position_runqueue(queue* q, int nelems, int qtype) anyitem = 0; if (!qlist[i]) { - for (j = i + 1 ; j < nelems ; j++) { + for (int j = i + 1 ; j < nelems ; j++) { if (!qlist[j]) { dist = gc_distance(comp[j]->latitude, comp[j]->longitude, diff --git a/psitrex.cc b/psitrex.cc index be0e15088..b485177e4 100644 --- a/psitrex.cc +++ b/psitrex.cc @@ -147,9 +147,7 @@ const psit_icon_mapping_t psit_icon_value_table[] = { static const char* psit_find_desc_from_icon_number(const int icon) { - const psit_icon_mapping_t* i; - - for (i = psit_icon_value_table; i->icon; i++) { + for (const psit_icon_mapping_t* i = psit_icon_value_table; i->icon; i++) { if (icon == i->value) { return i->icon; } @@ -160,14 +158,13 @@ psit_find_desc_from_icon_number(const int icon) static int psit_find_icon_number_from_desc(const char* desc) { - const psit_icon_mapping_t* i; int def_icon = 18; if (!desc) { return def_icon; } - for (i = psit_icon_value_table; i->icon; i++) { + for (const psit_icon_mapping_t* i = psit_icon_value_table; i->icon; i++) { if (case_ignore_strcmp(desc,i->icon) == 0) { return i->value; } diff --git a/random.cc b/random.cc index d30fde92f..2372fe30d 100644 --- a/random.cc +++ b/random.cc @@ -59,14 +59,14 @@ static char* rand_str(const int maxlen, const char* fmt) { char* res; - int i, len; + int len; len = rand_int(maxlen) + 1; res = (char*) xmalloc(len + 1); res[len] = '\0'; - for (i = 0; i < len; i++) { + for (int i = 0; i < len; i++) { int c = rand_int(26 + 26 + 10); if (c < 26) { c += 'a'; @@ -111,7 +111,7 @@ random_read() { #define RND(a) (rand_int(a) > 0) - int i, points; + int points; route_head* head; Waypoint* prev = nullptr; time_t time = gpsbabel_time; @@ -141,7 +141,7 @@ random_read() head = nullptr; } - for (i = 0; i < points; i++) { + for (int i = 0; i < points; i++) { Waypoint* wpt; garmin_fs_t* gmsd; diff --git a/raymarine.cc b/raymarine.cc index 0efc1aa0b..eca0f3c73 100644 --- a/raymarine.cc +++ b/raymarine.cc @@ -185,12 +185,10 @@ static void raymarine_read() { Waypoint* wpt; - unsigned int ix; - unsigned int rx; /* Read all waypoints */ - for (ix = 0; ix < 0x3FFF; ix++) { + for (unsigned int ix = 0; ix < 0x3FFF; ix++) { char sect[10]; char* str, *name, *lat, *lon; @@ -233,11 +231,10 @@ raymarine_read() /* Read all routes */ - for (rx = 0; rx < 0x3FFF; rx++) { + for (unsigned int rx = 0; rx < 0x3FFF; rx++) { char sect[10]; char* name; route_head* rte; - int wx; snprintf(sect, sizeof(sect), "Rt%d", rx); if (nullptr == (name = inifile_readstr(fin, sect, "Name"))) { @@ -248,7 +245,7 @@ raymarine_read() rte->rte_name = name; route_add_head(rte); - for (wx = 0; wx < 0x3FFF; wx++) { + for (int wx = 0; wx < 0x3FFF; wx++) { char buff[32]; char* str; Waypoint* wpt; @@ -287,10 +284,9 @@ same_points(const Waypoint* A, const Waypoint* B) static void register_waypt(const Waypoint* ref, const char) { - int i; Waypoint* wpt = const_cast(ref); - for (i = 0; i < waypt_table_ct; i++) { + for (int i = 0; i < waypt_table_ct; i++) { Waypoint* cmp = waypt_table[i]; if (same_points(wpt, cmp)) { diff --git a/rgbcolors.cc b/rgbcolors.cc index 76caaf9a1..54c469d34 100644 --- a/rgbcolors.cc +++ b/rgbcolors.cc @@ -222,7 +222,6 @@ int color_to_bbggrr(const char* opt_color) { int color_num; - unsigned int i; char* ep; color_num = strtol(opt_color, &ep, 10); @@ -238,7 +237,7 @@ color_to_bbggrr(const char* opt_color) return color_num; } - for (i = 0; i < sizeof(color_table) / sizeof(color_table[0]); i++) { + for (unsigned int i = 0; i < sizeof(color_table) / sizeof(color_table[0]); i++) { if (0 == case_ignore_strcmp(opt_color, color_table[i].cn)) { return (color_table[i].b << 16) + (color_table[i].g << 8) + diff --git a/skytraq.cc b/skytraq.cc index e488f1aeb..eba361d24 100644 --- a/skytraq.cc +++ b/skytraq.cc @@ -245,8 +245,7 @@ wr_char(int c) static void wr_buf(const unsigned char* str, int len) { - int i; - for (i = 0; i < len; i++) { + for (int i = 0; i < len; i++) { wr_char(str[i]); } } @@ -262,8 +261,8 @@ static uint8_t SECTOR_READ_END[13] = { 'E','N','D', 0, 'C','H','E','C','K','S',' static int skytraq_calc_checksum(const unsigned char* buf, int len) { - int i, cs = 0; - for (i = 0; i < len; i++) { + int cs = 0; + for (int i = 0; i < len; i++) { cs ^= buf[i]; } return cs; @@ -344,9 +343,9 @@ static int skytraq_expect_ack(uint8_t id) { uint8_t ack_msg[2]; - int i/*, rcv_len*/; + //int rcv_len; - for (i = 0; i < MSG_RETRIES; i++) { + for (int i = 0; i < MSG_RETRIES; i++) { // rcv_len = skytraq_rd_msg(ack_msg, sizeof(ack_msg)); // if (rcv_len == sizeof(ack_msg)) { if (skytraq_rd_msg(ack_msg, sizeof(ack_msg)) == res_OK) { @@ -398,9 +397,9 @@ skytraq_expect_msg(uint8_t id, const uint8_t* payload, int len) static int skytraq_wr_msg_verify(const uint8_t* payload, int len) { - int i, rc; + int rc; - for (i = 0; i < MSG_RETRIES; i++) { + for (int i = 0; i < MSG_RETRIES; i++) { if (i > 0) { db(1, "resending msg (id=0x%02x)...\n", payload[0]); } @@ -1056,7 +1055,7 @@ skytraq_read_tracks() struct read_state st; uint32_t log_wr_ptr; uint16_t sectors_free, sectors_total, /*sectors_used_a, sectors_used_b,*/ sectors_used; - int i, t, s, rc, got_sectors, total_sectors_read = 0; + int t, rc, got_sectors, total_sectors_read = 0; int read_at_once = MAX(atoi(opt_read_at_once), 1); int opt_first_sector_val = atoi(opt_first_sector); int opt_last_sector_val = atoi(opt_last_sector); @@ -1111,7 +1110,7 @@ skytraq_read_tracks() db(1, MYNAME ": Reading log data from device...\n"); db(1, MYNAME ": start=%d used=%d\n", opt_first_sector_val, sectors_used); db(1, MYNAME ": opt_last_sector_val=%d\n", opt_last_sector_val); - for (i = opt_first_sector_val; i < sectors_used; i += got_sectors) { + for (int i = opt_first_sector_val; i < sectors_used; i += got_sectors) { for (t = 0, got_sectors = 0; (t < SECTOR_RETRIES) && (got_sectors <= 0); t++) { if (atoi(opt_read_at_once) == 0 || multi_read_supported == 0) { rc = skytraq_read_single_sector(i, buffer); @@ -1158,7 +1157,7 @@ skytraq_read_tracks() continue; // skip decoding } - for (s = 0; s < got_sectors; s++) { + for (int s = 0; s < got_sectors; s++) { db(4, MYNAME ": Decoding sector #%i...\n", i+s); rc = process_data_sector(&st, buffer+s*SECTOR_SIZE, SECTOR_SIZE); if (rc == 0) { @@ -1195,7 +1194,7 @@ skytraq_probe() uint8_t odm_ver[4]; uint8_t revision[4]; } MSG_SOFTWARE_VERSION; - int i, rc; + int rc; // TODO: get current serial port baud rate and try that first // (only sensible if init to 4800 can be disabled...) @@ -1205,7 +1204,7 @@ skytraq_probe() baud_rates_count = 1; } - for (i = 0; i < baud_rates_count; i++) { + for (int i = 0; i < baud_rates_count; i++) { db(1, MYNAME ": Probing SkyTraq Venus at %ibaud...\n", baud_rates[i]); rd_drain(); @@ -1274,7 +1273,6 @@ static void skytraq_set_location() { double lat, lng; - unsigned int i; uint8_t MSG_SET_LOCATION[17] = { 0x36, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; uint8_t MSG_GET_LOCATION = 0x35; @@ -1283,7 +1281,7 @@ skytraq_set_location() sscanf(opt_set_location, "%lf:%lf", &lat, &lng); le_write_double(&MSG_SET_LOCATION[1], lat); le_write_double(&MSG_SET_LOCATION[9], lng); - for (i=0; i>8)&0xff; MSG_GET_POI[2]=(poi)&0xff; if (skytraq_wr_msg_verify((uint8_t*)&MSG_GET_POI, sizeof(MSG_GET_POI)) != res_OK) { diff --git a/teletype.cc b/teletype.cc index d0b2839ff..1377ef5e8 100644 --- a/teletype.cc +++ b/teletype.cc @@ -57,8 +57,7 @@ teletype_rd_deinit() static void teletype_read() { - uint32_t i; - for (i = 0; i < tty_wpt_count; i++) { + for (uint32_t i = 0; i < tty_wpt_count; i++) { Waypoint* wpt = new Waypoint; wpt->shortname = (gbfgetcstr(fin)); wpt->description = (gbfgetcstr(fin)); diff --git a/tomtom.cc b/tomtom.cc index 392905301..b5d90050d 100644 --- a/tomtom.cc +++ b/tomtom.cc @@ -373,10 +373,9 @@ compute_blocks(struct hdr* start, int count, newblock->maxlat = maxlat; newblock->size = 4 * 5 + 1; /* hdr is 5 longs, 1 char */ if (count < 20) { - int i; Waypoint* wpt = nullptr; - for (i = 0; i < count; i++) { + for (int i = 0; i < count; i++) { newblock->size += 4 * 3 + 1; /* wpt const part 3 longs, 1 char */ wpt = start[i].wpt; diff --git a/tpo.cc b/tpo.cc index 0825438f3..c4c29a3cf 100644 --- a/tpo.cc +++ b/tpo.cc @@ -620,7 +620,6 @@ static void tpo_process_tracks() int latscale; int lat = 0; int lon = 0; - unsigned int jj; route_head* track_temp; char rgb[7],bgr[7]; int bbggrr = 0; @@ -702,7 +701,7 @@ static void tpo_process_tracks() // Process the track bytes llvalid = 0; - for (jj = 0; jj < track_byte_count;) { + for (unsigned int jj = 0; jj < track_byte_count;) { Waypoint* waypoint_temp; // Time to read a new latlong? @@ -809,7 +808,6 @@ static unsigned int tpo_index_ptr; static void tpo_process_waypoints() { unsigned int waypoint_count; - unsigned int ii; //printf("Processing Waypoints...\n"); @@ -834,7 +832,7 @@ static void tpo_process_waypoints() } // Read/process each waypoint in the file - for (ii = 0; ii < waypoint_count; ii++) { + for (unsigned int ii = 0; ii < waypoint_count; ii++) { Waypoint* waypoint_temp; Waypoint* waypoint_temp2; unsigned int name_length; @@ -930,7 +928,6 @@ static void tpo_process_waypoints() static void tpo_process_map_notes() { unsigned int waypoint_count; - unsigned int ii; //printf("Processing Map Notes...\n"); @@ -950,13 +947,12 @@ static void tpo_process_map_notes() } // Process each waypoint - for (ii = 0; ii < waypoint_count; ii++) { + for (unsigned int ii = 0; ii < waypoint_count; ii++) { int lat; int lon; unsigned int name_length; Waypoint* waypoint_temp; unsigned int num_bytes; - unsigned int jj; //UNKNOWN DATA LENGTH @@ -1023,7 +1019,7 @@ static void tpo_process_map_notes() // block. May be 8/16/32 bits. num_bytes = tpo_read_int(); //printf("num_bytes: %x\n", num_bytes); - for (jj = 0; jj < num_bytes; jj++) { + for (unsigned int jj = 0; jj < num_bytes; jj++) { (void) gbfgetc(tpo_file_in); // Skip bytes } @@ -1047,7 +1043,6 @@ static void tpo_process_map_notes() static void tpo_process_symbols() { unsigned int waypoint_count; - unsigned int ii; //printf("Processing Symbols...\n"); @@ -1067,7 +1062,7 @@ static void tpo_process_symbols() } // Process each waypoint - for (ii = 0; ii < waypoint_count; ii++) { + for (unsigned int ii = 0; ii < waypoint_count; ii++) { int lat; int lon; Waypoint* waypoint_temp; @@ -1102,7 +1097,6 @@ static void tpo_process_symbols() static void tpo_process_text_labels() { unsigned int waypoint_count; - unsigned int ii; //printf("Processing Text Labels...\n"); @@ -1122,8 +1116,7 @@ static void tpo_process_text_labels() } // Process each waypoint - for (ii = 0; ii < waypoint_count; ii++) { - int jj; + for (unsigned int ii = 0; ii < waypoint_count; ii++) { int lat; int lon; unsigned int name_length; @@ -1145,7 +1138,7 @@ static void tpo_process_text_labels() // Assign a generic waypoint name waypoint_temp->shortname = QString("TXT %1").arg(ii + 1); - for (jj = 0; jj < 16; jj++) { + for (int jj = 0; jj < 16; jj++) { //UNKNOWN DATA LENGTH (void) gbfgetc(tpo_file_in); } @@ -1177,7 +1170,6 @@ static void tpo_process_text_labels() static void tpo_process_routes() { unsigned int route_count; - unsigned int ii; //printf("Processing Routes...\n"); @@ -1198,9 +1190,8 @@ static void tpo_process_routes() // Read/process each route in the file // - for (ii = 0; ii < route_count; ii++) { + for (unsigned int ii = 0; ii < route_count; ii++) { unsigned int name_length = 0; - unsigned int jj; unsigned int waypoint_cnt; route_head* route_temp; @@ -1245,7 +1236,7 @@ static void tpo_process_routes() // Run through the list of waypoints, look up each in our // index, then add the waypoint to this route. // - for (jj = 0; jj < waypoint_cnt; jj++) { + for (unsigned int jj = 0; jj < waypoint_cnt; jj++) { Waypoint* waypoint_temp; unsigned int val; @@ -1376,10 +1367,8 @@ tpo_rd_init(const QString& fname) static void tpo_rd_deinit() { - unsigned int i; - // Free the waypoint index, we don't need it anymore. - for (i = 0; i < tpo_index_ptr; i++) { + for (unsigned int i = 0; i < tpo_index_ptr; i++) { delete tpo_wp_index[i]; } tpo_index_ptr = 0; diff --git a/trackfilter.cc b/trackfilter.cc index a10432700..0ac8b4b0a 100644 --- a/trackfilter.cc +++ b/trackfilter.cc @@ -301,8 +301,6 @@ void TrackFilter::trackfilter_pack_init_rte_name(route_head* track, const time_t void TrackFilter::trackfilter_title() { - int i; - if (opt_title == nullptr) { return; } @@ -310,7 +308,7 @@ void TrackFilter::trackfilter_title() if (strlen(opt_title) == 0) { fatal(MYNAME "-title: Missing your title!\n"); } - for (i = 0; i < track_ct; i++) { + for (int i = 0; i < track_ct; i++) { route_head* track = track_list[i].track; trackfilter_pack_init_rte_name(track, 0); } @@ -627,7 +625,6 @@ void TrackFilter::trackfilter_split() void TrackFilter::trackfilter_move() { - int i; queue* elem, *tmp; Waypoint* wpt; time_t delta; @@ -637,7 +634,7 @@ void TrackFilter::trackfilter_move() return; } - for (i = 0; i < track_ct; i++) { + for (int i = 0; i < track_ct; i++) { route_head* track = track_list[i].track; QUEUE_FOR_EACH((queue*)&track->waypoint_list, elem, tmp) { wpt = (Waypoint*)elem; @@ -655,7 +652,6 @@ void TrackFilter::trackfilter_move() void TrackFilter::trackfilter_synth() { - int i; queue* elem, *tmp; Waypoint* wpt; @@ -670,7 +666,7 @@ void TrackFilter::trackfilter_synth() fix = trackfilter_parse_fix(&nsats); - for (i = 0; i < track_ct; i++) { + for (int i = 0; i < track_ct; i++) { route_head* track = track_list[i].track; first = 1; QUEUE_FOR_EACH((queue*)&track->waypoint_list, elem, tmp) { @@ -770,7 +766,7 @@ int TrackFilter::trackfilter_range() /* returns number of track points left aft { time_t start, stop; queue* elem, *tmp; - int i, dropped, inside = 0; + int dropped, inside = 0; if (opt_start != nullptr) { start = trackfilter_range_check(opt_start); @@ -786,7 +782,7 @@ int TrackFilter::trackfilter_range() /* returns number of track points left aft dropped = inside = 0; - for (i = 0; i < track_ct; i++) { + for (int i = 0; i < track_ct; i++) { route_head* track = track_list[i].track; QUEUE_FOR_EACH((queue*)&track->waypoint_list, elem, tmp) { @@ -826,9 +822,7 @@ int TrackFilter::trackfilter_range() /* returns number of track points left aft void TrackFilter::trackfilter_seg2trk() { - int i; - - for (i = 0; i < track_ct; i++) { + for (int i = 0; i < track_ct; i++) { queue* elem, *tmp; route_head* src = track_list[i].track; route_head* dest = nullptr; @@ -875,12 +869,12 @@ void TrackFilter::trackfilter_seg2trk() void TrackFilter::trackfilter_trk2seg() { - int i, first; + int first; route_head* master; master = track_list[0].track; - for (i = 1; i < track_ct; i++) { + for (int i = 1; i < track_ct; i++) { queue* elem, *tmp; route_head* curr = track_list[i].track; diff --git a/util.cc b/util.cc index 40017da90..3bcaba266 100644 --- a/util.cc +++ b/util.cc @@ -848,9 +848,8 @@ month_lookup(const char* m) "JAN", "FEB", "MAR", "APR", "MAY", "JUN", "JUL", "AUG", "SEP", "OCT", "NOV", "DEC", nullptr }; - const char** mp; - for (mp = months; *mp; mp++) { + for (const char** mp = months; *mp; mp++) { if (0 == case_ignore_strcmp(*mp, m)) { return mp - months; } @@ -1154,9 +1153,7 @@ gstrsub(const char* s, const char* search, const char* replace) char* strupper(char* src) { - char* c; - - for (c = src; *c; c++) { + for (char* c = src; *c; c++) { *c = toupper(*c); } return src; @@ -1168,9 +1165,7 @@ strupper(char* src) char* strlower(char* src) { - char* c; - - for (c = src; *c; c++) { + for (char* c = src; *c; c++) { *c = tolower(*c); } return src; diff --git a/vecs.cc b/vecs.cc index 82bdb6a1d..4b9e83cc3 100644 --- a/vecs.cc +++ b/vecs.cc @@ -1130,12 +1130,11 @@ exit_vecs() { vecs_t* vec = vec_list; while (vec->vec) { - arglist_t* ap; if (vec->vec->exit) { (*vec->vec->exit)(); } if (vec->vec->args) { - for (ap = vec->vec->args; ap->argstring; ap++) { + for (auto ap = vec->vec->args; ap->argstring; ap++) { if (ap->defaultvalue && (ap->argtype == ARGTYPE_INT) && ! is_integer(ap->defaultvalue)) { @@ -1281,7 +1280,7 @@ find_vec(const char* vecname, const char** opts) } if (vec->vec->args) { - for (arglist_t* ap = vec->vec->args; ap->argstring; ap++) { + for (auto ap = vec->vec->args; ap->argstring; ap++) { const char* opt; if (res) { @@ -1338,7 +1337,7 @@ find_vec(const char* vecname, const char** opts) } if (vec_list[0].vec->args) { - for (arglist_t* ap = vec_list[0].vec->args; ap->argstring; ap++) { + for (auto ap = vec_list[0].vec->args; ap->argstring; ap++) { const char* opt; if (res) { @@ -1398,7 +1397,6 @@ get_option(const char* iarglist, const char* argname) const size_t arglen = strlen(argname); char* arglist; char* rval = nullptr; - char* arg; char* argp; if (!iarglist) { @@ -1407,7 +1405,7 @@ get_option(const char* iarglist, const char* argname) arglist = xstrdup(iarglist); - for (arg = arglist; argp = strtok(arg, ","), nullptr != argp; arg = nullptr) { + for (char* arg = arglist; argp = strtok(arg, ","), nullptr != argp; arg = nullptr) { if (0 == case_ignore_strncmp(argp, argname, arglen)) { /* * If we have something of the form "foo=bar" @@ -1459,9 +1457,7 @@ sort_and_unify_vecs(int* ctp) { int vc; vecs_t** svp; - vecs_t* vec; #if CSVFMTS_ENABLED - style_vecs_t* svec; #endif int i = 0; @@ -1477,7 +1473,7 @@ sort_and_unify_vecs(int* ctp) svp = (vecs_t**)xcalloc(vc, sizeof(style_vecs_t*)); /* Normal vecs are easy; populate the first part of the array. */ - for (vec = vec_list; vec->vec; vec++, i++) { + for (vecs_t* vec = vec_list; vec->vec; vec++, i++) { svp[i] = vec; if (svp[i]->parent == nullptr) { svp[i]->parent = svp[i]->name; @@ -1486,7 +1482,7 @@ sort_and_unify_vecs(int* ctp) #if CSVFMTS_ENABLED /* Walk the style list, parse the entries, dummy up a "normal" vec */ - for (svec = style_list; svec->name; svec++, i++) { + for (style_vecs_t* svec = style_list; svec->name; svec++, i++) { xcsv_read_internal_style(svec->style_buf); svp[i] = (vecs_t*) xcalloc(1, sizeof** svp); svp[i]->name = svec->name; @@ -1538,7 +1534,6 @@ void disp_vecs() { vecs_t** svp; - arglist_t* ap; int vc; int i = 0; @@ -1548,7 +1543,7 @@ disp_vecs() continue; } printf(VEC_FMT, svp[i]->name, svp[i]->desc); - for (ap = svp[i]->vec->args; ap && ap->argstring; ap++) { + for (auto ap = svp[i]->vec->args; ap && ap->argstring; ap++) { if (!(ap->argtype & ARGTYPE_HIDDEN)) printf(" %-18.18s %s%-.50s %s\n", ap->argstring, @@ -1566,7 +1561,6 @@ void disp_vec(const char* vecname) { vecs_t** svp; - arglist_t* ap; int vc; int i = 0; @@ -1576,7 +1570,7 @@ disp_vec(const char* vecname) continue; } printf(VEC_FMT, svp[i]->name, svp[i]->desc); - for (ap = svp[i]->vec->args; ap && ap->argstring; ap++) { + for (auto ap = svp[i]->vec->args; ap && ap->argstring; ap++) { if (!(ap->argtype & ARGTYPE_HIDDEN)) printf(" %-18.18s %s%-.50s %s\n", ap->argstring, @@ -1619,8 +1613,7 @@ disp_v1(ff_type t) static void disp_v2(ff_vecs_t* v) { - int i; - for (i = 0; i < 3; i++) { + for (int i = 0; i < 3; i++) { putchar((v->cap[i] & ff_cap_read) ? 'r' : '-'); putchar((v->cap[i] & ff_cap_write) ? 'w' : '-'); } @@ -1660,10 +1653,8 @@ void disp_help_url(const vecs_t* vec, arglist_t* arg) static void disp_v3(const vecs_t* vec) { - arglist_t* ap; - disp_help_url(vec, nullptr); - for (ap = vec->vec->args; ap && ap->argstring; ap++) { + for (auto ap = vec->vec->args; ap && ap->argstring; ap++) { if (!(ap->argtype & ARGTYPE_HIDDEN)) { printf("option\t%s\t%s\t%s\t%s\t%s\t%s\t%s", vec->name, @@ -1689,7 +1680,7 @@ disp_formats(int version) { vecs_t** svp; vecs_t* vec; - int i, vc = 0; + int vc = 0; switch (version) { case 0: @@ -1697,7 +1688,7 @@ disp_formats(int version) case 2: case 3: svp = sort_and_unify_vecs(&vc); - for (i=0; ihead; chunk; chunk = next) { + struct buf_chunk* next; + for (struct buf_chunk* chunk = h->head; chunk; chunk = next) { next = chunk->next; xfree(chunk); } @@ -226,11 +226,10 @@ static void buf_extend(struct buf_head* h, size_t amt) static void buf_update_checksum(struct buf_head* h, const void* data, size_t len) { unsigned char* cp = (unsigned char*) data; - unsigned i; db(4, "Updating checksum with %p, %lu, before: %02x ", data, (unsigned long) len, h->checksum); - for (i = 0; i < len; i++) { + for (unsigned i = 0; i < len; i++) { h->checksum ^= cp[i]; } db(4, "after: %02x\n", h->checksum); @@ -373,9 +372,8 @@ static int wsg1000_try() static wintec_gps_types guess_device() { - int i; db(1, "Guessing device...\n"); - for (i = 0; i < 5; i++) { + for (int i = 0; i < 5; i++) { if (wbt200_try()) { return WBT200; } @@ -452,8 +450,6 @@ static int starts_with(const char* buf, const char* pat) */ static int do_cmd(const char* cmd, const char* expect, char* buf, int len) { - int trycount; - rd_drain(); wr_cmdl(cmd); @@ -463,7 +459,7 @@ static int do_cmd(const char* cmd, const char* expect, char* buf, int len) * NMEA data all the time so it's highly likely that it'll be in the * middle of an NMEA sentence when we start listening. */ - for (trycount = 0; trycount < RETRIES; trycount++) { + for (int trycount = 0; trycount < RETRIES; trycount++) { rd_line(buf, len); db(3, "Got: %s\n", buf); if (starts_with(buf, expect)) { @@ -790,9 +786,8 @@ static void wbt200_data_read() static int all_null(const void* buf, const int len) { const char* bp = (const char*) buf; - int i; - for (i = 0; i < len; i++) { + for (int i = 0; i < len; i++) { if (bp[i]) { return 0; } -- 2.30.2